Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor ort specific fusions #2039

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Refactor ort specific fusions #2039

wants to merge 6 commits into from

Conversation

gramalingam
Copy link
Collaborator

@gramalingam gramalingam commented Jan 24, 2025

Continue cleanup of both ORT-specific fusions and function-rewrite-rules.

  • Function rewrite-rules are deprecated and will be removed soon.
  • ORT-specific fusions are being moved into the ort_fusions folder.

@gramalingam gramalingam marked this pull request as draft January 24, 2025 21:50
Copy link

codecov bot commented Jan 24, 2025

❌ 99 Tests Failed:

Tests completed Failed Passed Skipped
6655 99 6556 3134
View the top 3 failed test(s) by shortest run time
::onnxscript.rewriter.onnxruntime.group_normalization_merge_silu_test
Stack Traces | 0s run time
ImportError while importing test module '.../rewriter/onnxruntime/group_normalization_merge_silu_test.py'.
Hint: make sure your test modules/packages have valid Python names.
Traceback:
.../Library/Frameworks/Python.framework/Versions/3.10/lib/python3.10/importlib/__init__.py:126: in import_module
    return _bootstrap._gcd_import(name[level:], package, level)
.../rewriter/onnxruntime/group_normalization_merge_silu_test.py:9: in <module>
    from onnxscript.rewriter.onnxruntime import (
E   ImportError: cannot import name 'instance_to_group_normalization' from 'onnxscript.rewriter.onnxruntime' (.../rewriter/onnxruntime/__init__.py)
onnxscript.backend.onnx_export_test.TestOnnxBackEnd::test_export2python_produces_correct_onnx_script_model_0462_test_hannwindow_symmetric
Stack Traces | 0.003s run time
onnxscript\backend\onnx_export_test.py:137: in extract_functions
    mod = importlib.import_module(import_name)
C:\hostedtoolcache\windows\Python\3.11.9\x64\Lib\importlib\__init__.py:126: in import_module
    return _bootstrap._gcd_import(name[level:], package, level)
E   ModuleNotFoundError: No module named 'tests.onnx_backend_test_code.test_hannwindow_symmetric'

The above exception was the direct cause of the following exception:
.nox\test_torch_nightly\Lib\site-packages\parameterized\parameterized.py:620: in standalone_func
    return func(*(a + p.args), **p.kwargs, **kw)
onnxscript\backend\onnx_export_test.py:271: in test_export2python_produces_correct_onnx_script_model
    functions = extract_functions(backend_test.name, code, self.test_folder)
onnxscript\backend\onnx_export_test.py:139: in extract_functions
    raise AssertionError(
E   AssertionError: Unable to import 'tests.onnx_backend_test_code.test_hannwindow_symmetric' (e=No module named 'tests.onnx_backend_test_code.test_hannwindow_symmetric') (file: 'D:\\a\\onnxscript\\onnxscript\\tests\\onnx_backend_test_code\\test_hannwindow_symmetric.py', absolute path: 'D:\\a\\onnxscript\\onnxscript\\tests\\onnx_backend_test_code\\test_hannwindow_symmetric.py', current folder: D:\a\onnxscript\onnxscript
E   ---- CONTENT --
E   import numpy
E   from onnx import TensorProto
E   from onnx.helper import make_tensor
E   from onnxscript import script, external_tensor
E   from onnxscript.values import Opset
E   from onnxscript.onnx_types import FLOAT, INT32
E   from onnxscript.onnx_opset import opset17
E   
E   @script()
E   def bck_test_hannwindow_symmetric(x: INT32) -> (FLOAT[10]):
E       y = opset17.HannWindow(x, periodic=0)
E       return y
onnxscript.backend.onnx_export_test.TestOnnxBackEnd::test_export2python_produces_correct_onnx_script_model_1248_test_tril_one_row_neg
Stack Traces | 0.003s run time
onnxscript\backend\onnx_export_test.py:137: in extract_functions
    mod = importlib.import_module(import_name)
C:\hostedtoolcache\windows\Python\3.11.9\x64\Lib\importlib\__init__.py:126: in import_module
    return _bootstrap._gcd_import(name[level:], package, level)
E   ModuleNotFoundError: No module named 'tests.onnx_backend_test_code.test_tril_one_row_neg'

The above exception was the direct cause of the following exception:
.nox\test\Lib\site-packages\parameterized\parameterized.py:620: in standalone_func
    return func(*(a + p.args), **p.kwargs, **kw)
onnxscript\backend\onnx_export_test.py:271: in test_export2python_produces_correct_onnx_script_model
    functions = extract_functions(backend_test.name, code, self.test_folder)
onnxscript\backend\onnx_export_test.py:139: in extract_functions
    raise AssertionError(
E   AssertionError: Unable to import 'tests.onnx_backend_test_code.test_tril_one_row_neg' (e=No module named 'tests.onnx_backend_test_code.test_tril_one_row_neg') (file: 'D:\\a\\onnxscript\\onnxscript\\tests\\onnx_backend_test_code\\test_tril_one_row_neg.py', absolute path: 'D:\\a\\onnxscript\\onnxscript\\tests\\onnx_backend_test_code\\test_tril_one_row_neg.py', current folder: D:\a\onnxscript\onnxscript
E   ---- CONTENT --
E   import numpy
E   from onnx import TensorProto
E   from onnx.helper import make_tensor
E   from onnxscript import script, external_tensor
E   from onnxscript.values import Opset
E   from onnxscript.onnx_types import INT64
E   from onnxscript.onnx_opset import opset14
E   
E   @script()
E   def bck_test_tril_one_row_neg(x: INT64[3,1,5]) -> (INT64[3,1,5]):
E       y = opset14.Trilu(x, upper=0)
E       return y

To view more test analytics, go to the Test Analytics Dashboard
📋 Got 3 mins? Take this short survey to help us improve Test Analytics.

@gramalingam gramalingam changed the title [DRAFT] Refactor ort specific fusions Refactor ort specific fusions Feb 10, 2025
@gramalingam gramalingam marked this pull request as ready for review February 10, 2025 19:45
onnxscript/rewriter/ort_fusions/__init__.py Fixed Show fixed Hide fixed
from onnxscript.rewriter.ort_fusions._core import optimize_for_ort

ORT_PATTERN_REWRITE_RULES = [

Check notice

Code scanning / CodeQL

Unused global variable Note

The global variable 'ORT_PATTERN_REWRITE_RULES' is not used.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Development

Successfully merging this pull request may close these issues.

2 participants